Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 5 Apr 2006 23:59:18 +0000 (00:59 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 5 Apr 2006 23:59:18 +0000 (00:59 +0100)

Trivial merge